From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Fri, 9 Sep 2011 05:17:05 +0000 (+0000)
Subject: Followup r96543, + is not the correct thing to use here
X-Git-Tag: 1.31.0-rc.0~27772
X-Git-Url: http://git.cyclocoop.org/%22.%24match%5B1%5D.%22?a=commitdiff_plain;h=109636020d6067c0d340ac54d55bcd0b112925f8;p=lhc%2Fweb%2Fwiklou.git

Followup r96543, + is not the correct thing to use here
---

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 1188c507e4..a6da010af9 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -976,7 +976,7 @@ class LogPager extends ReverseChronologicalPager {
 		$info = array(
 			'tables'     => $tables,
 			'fields'     => $fields,
-			'conds'      => $conds + $this->mConds,
+			'conds'      => array_merge( $conds, $this->mConds ),
 			'options'    => $options,
 			'join_conds' => $joins,
 		);